From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 16 Aug 2011 05:58:30 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~845^2~80
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3f74064edab68e5620fade9b802e863cb110afd2;p=emacs.git

Merge from trunk.
---

3f74064edab68e5620fade9b802e863cb110afd2